projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 314f397 4b347fe)
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 10 Oct 2016 14:35:32 +0000 (07:35 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 10 Oct 2016 14:35:32 +0000 (07:35 -0700)
commit97046e811c738a21e0c4badbb5bab146b6adf6c8
tree4a10f7fc7e8ab2df291eb6fff2d5e19eb4bbb15ctree | snapshot
parent314f3972bf864a527494db043f01d603b0eef522commit | diff
parent4b347fe5368aedc161e172bd110e05e2f7f37463commit | diff
Merge from origin/emacs-25

4b347fe Clarify that doc fixes are okay in feature freeze
01669ad Avoid crashes when setting the cursor
f2144ee Restore 'command-debug-status' functionality
ec6e4b9 ; Minor addition to CONTRIBUTE
CONTRIBUTE diff1 | diff2 | blob | history
doc/lispref/debugging.texi diff1 | diff2 | blob | history
lisp/subr.el diff1 | diff2 | blob | history
src/xdisp.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.